Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 30 Aug 2011 06:23:47 +0000 (23:23 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 30 Aug 2011 06:23:47 +0000 (23:23 -0700)
commitc84a97625165fa18daff684239115dfd60f07e51
treef4d449e917b9706fecf3f727977c5bab59cc7766
parent781f56119580f9ad7fc7eb9e18a1aa8c4ab05693
parent92aa5bcd57ef861363d0989c03129127b8903157
Merge from trunk.